Merging in current code from heroku/databasedotcom
Merging in current code from heroku/databasedotcom