Sync latest compiler pull requests
Merge pull request #1870 from bactrian/sync-prs-1396802363

Sync OCaml compiler PRs