Merge "autopep8 fix for flake8"