Adding support for group hierarchies when checking group membership.
Merge remote-tracking branch 'upstream2/master'