Fix scaffolding wrt PEP8
Merge branch 'mozilla/master'