master
Start to prepare for a release matching Python 3.7.0rc1.
Merged changes from bpo-33796 and bpo-33805. (#140)