Updated upgrades.js to improved format
Merge branch 'iv-1.1' into iv-1.2