Merge branch '3.6.1' of github.com:ned-deily/cpython into 3.6