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


GitHub sha: 4ad935f9