_ids are now unique for their model's collection
Merge branch 'master' into acl