Fixed query - user ID field is 'uid' not 'id'
Merge branch '1.3'