Merge from twhittock:enum-groups