Re-merge tpope and heroku versions.