Fix pep8 warnings
Merge branch 'upstream'