Merge pull request #1431 from tpikonen/flake8