Merge branch 'rb/maint-python-path'