Merged upstream after pep8_cleanup