Add extra functions to User.
Merge branch 'master' into develop