update for appliance fix
Merge branch 'master' into authenticate
Merge branch 'authenticate' into herokuprod