Merge branch 'master' into flake8++