Merge branch 'master' into pyup-update-wheel-0.31.1-to-0.32.0