Merging from heroku master
Merge
Merge
Merge
Merge
Merge