Fix to group/user identification
Merge branch '1.1.1-RELEASE'