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

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

GitHub
sha: f4d37d05