Merge branch 'bug_671_python_update' into experimental