Pushed into 2.0 with a placeholder upgrade script forward-ported to master and 2.1 to avoid collisions in the future.
Pushed into 2.0 with a placeholder upgrade script forward-ported to master and 2.1 to avoid collisions in the future.