Merge branch 'master' into 'heroku'

Then deploy it (or just deploy it and delete this P.R.)

@cg505, yes?