Display os & opam-version on internal errors as well
Update CHANGES
Merge branch 'master' of github.com:OCamlPro/opam