branch on users in ajax.php file and lib.inc.php
Merge origin/master