Merge "Fixes little bug in enum-generator"