1.8.7 fixes
Merge pull request #1306 from heroku/187-fix

1.8.7 fixes