Merge from dreadatour/Flake8Lint