Camlp5 6.12
Merge pull request #2729 from yallop/camlp5-6-12

Camlp5 6.12