Nullable enum fix

Code from #253, but resolved a merge conflict in the change log.

Sorry, I don't trust any programmer to rebase... even myself.