Merge branch 'daily' into next
Merge branch 'master' into next
Fix minor User bug.

Database was always being updated to 'User' type,
even when 'Anon' should have been used.