! optgroup FTW

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1149 from Oldiesmann/release-2.1

! optgroup FTW