Broke optgroups recently.
Merge branch '4.2-devel' into 4.3-devel
Switching terminology.