Merge pull request #287 from Verdent/272-enumset-deserialization

Fixes #272 EnumSet deserialization