Merge branch 'python-fixes'