Sync latest compiler pull requests
Merge pull request #1900 from bactrian/sync-prs-1397516401

Sync OCaml compiler PRs