Merge "Fix pep8 failure"