Merge branch 'master' into more-flake8