Merge branch 'upstream' into 132-update-galaxy-version