Port fix of flake8 to branch master