Merge proposals

fold-grammars has no merge proposals.