Merge branch 'master' into py35-and-pypy