Merge branch 'master' of https://github.com/discourse/discourse

Merge branch ‘master’ of https://github.com/discourse/discourse


GitHub sha: e62a85cf