Not all users have names yet
Merge branch 'master' into location_two
Save user name
Merge branch 'master' into location_two