Comment 5 for bug 869338

I rebased the branch to remove tiny typo fix commits and restored some munged whitespace, then wrapped the upgrade script with 0655 and pushed to master.

It works quite nicely in my testing - thanks so much for your contribution!