Merge branch 'east825/py-move-to-toplevel'