Null merge 3.5

Python/random.c is more then in the 3.6 branch.