merge upstream
Merge branch 'master' of github.com:grengojbo/users-formula