I would like to add my congratulations to DylanM for the TODO 'fix' that overcomes the Windows 10 upgrading problem. Like the other posters on this topic, I spent hours trying to get past the 75% mark, until I chanced on DylanM's fix. Worked first time!!!!