Merge branch 'master' into py3k