Merge branch 'master' into fix-did-not-votes

Conflicts:
	app/models/vote.rb