Merge branch 'east825/py3-docstring-formatter'