And of course this doesn't belong in this pull request, as it has nothing to do with Heroku! :)