Description of problem: Current tip of the branch (revision 4817682) contains backports which breaks pep8 tests. This bug is to track fix for that.