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


GitHub sha: efe12b51