Merge pull request #1686 from shackbarth/upgrade_test