Fix UPGRADE
Merge branch '2.0'