Merge pull request heroku#245 from heroku/develop

v126

Merge pull request heroku#244 from heroku/develop

v125

Merge pull request heroku#239 from heroku/develop

v124

Merge pull request heroku#238 from heroku/develop

v123

Merge pull request heroku#236 from heroku/develop

v122

Merge pull request heroku#222 from heroku/develop

v121

Merge pull request heroku#214 from heroku/develop

v120

Merge pull request heroku#207 from heroku/develop

v119

Merge pull request heroku#204 from heroku/develop

v118

Merge pull request heroku#193 from heroku/develop

v117