Merge in latest from heroku's repo (v32)