Merge changes from master branch. Fix quota updates. Clean up util. Create token when creating user from admin interface.
Refs #1470Refs #1471
View revisions
Also available in: Atom