Merge pull request #561 from totten/upgrade-finish-reload