Merge "Make pep8 job great again"