Merge branch 'placate-pep8-n815' into 'master'

Adapt to changed flake8 naming

See merge request !64