PEP8 Style fixes
Merge remote-tracking branch 'upstream/master'
PEP8 style fixes
Style fixes for ext package
One PEP8 change breaks comparator tests - reverting
PEP8 manual style fixes
final PEP8 error fixed in ext package