Enable Phoenix 2.1 to still work with pre 0.94.10 versions
Merge branch 'master' of github.com:forcedotcom/phoenix