Merge pull request #1835 from shadowdare/patch-10

2.1: Show Friendly Error Message for Non-Numeric Category ID
EditCategory fix: use exception, not form error
Merge branch '2.1' of github.com:vanillaforums/Garden into 2.1