Merge master
Automatic style corrections courtesy of autopep8.