Merge

diff --cc Lib/test/test_builtin.py
Simple merge

diff --cc Lib/test/test_long.py
Simple merge

diff --cc Misc/NEWS
Simple merge

diff --cc Python/bltinmodule.c
Simple merge