Merge "Be more db-friendly when purging expired userrights"