Fixed PEP8 issues that made build fail.
Merge branch 'master' into iss22