update heroku
update stack
Merge branch 'master' into bm
Merge branch 'bm'