Fixes #2147 - Problems with the savegame upgrades