Populate users table w/ non-supers
Merge origin/master