use more general Set interface instead of EnumSet
use more general Set interface instead of EnumSet
Added tag 1.34 for changeset f8327b52b2ab