Better workarounds for e2e scenarios, Closes GH-23
Merge branch 'master' into heroku-production
Release the app.