Merge branch 'GeonU/flake8-bug-setuptools-options'