Add the user's location to their user info.
Merge branch 'master' into release/2.1b1