Merge branch 'master' into club-vices
Consider usernames part of English text
Merge branch 'club-vices'