Better localization of groups
Include some of the newer types in the schema
Merge remote-tracking branch 'upstream/master'