PEP8 fix.
Merge branch 'master' into rename-dir-path