Port fix of flake8 to branch master

Are you sure you want 7.0 here?