Merge branch 'master' into pyup-update-wheel-0.30.0-to-0.31.0