Going back to 2.1.0 release number, as this is what we want to release as
Merge branch 'master' of github.com:forcedotcom/phoenix