Merge branch 'master' into heroku-1