Merge pull request #1687 from shackbarth/upgrade_test