pep8 tidy
Merge branch 'master' into logging-refactor