Merge pull request #877 from jmaas/master

pep8 work