Merge branch 'master' into other-flake8