Merge #461 Hyphenate compound modifiers.