Merge remote-tracking branch 'origin/bug_671_python_update'