Import patch from Damien Doligez
Merge branch 'master' of github.com:OCamlPro/opam-repository
Merge branch 'master' of github.com:OCamlPro/opam-repository