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

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


GitHub sha: 0edf012d