Sync latest compiler pull requests
Merge pull request #1883 from bactrian/sync-prs-1397084401

Sync OCaml compiler PRs