Fix for group names with Unicode in them.
Porting the fix to 14.06 to the master.
Merge