Finish 2.3.4
Merge remote-tracking branch 'heroku/master'