Merge branch 'master' into pep8-test_util