Fix validation of category in OptionForm
Merge branch '2.0'