Merge branch 'master' into userstuff
handle anonymous users' guesses
Merge branch 'userstuff'