Merge branches 'users' and 'master' into users