Hopefully final pep8 fix for jenkins
Merge pull request #969 from timlinux/develop

Hopefully final pep8 fix for jenkins