update to menhir.20140422

closes #2774
Merge pull request #2775 from mirage/update-mehir

update to menhir.20140422