Merge branch 'master' into feature/line-before-module-docstring