+ Fix issue with not being able to add a group to a group type that only allows one type of child group type (Fixes #654)
Merge remote-tracking branch 'upstream/master'