Fix for OCamlPro/opam#641 compatible with OPAM 1.0.0
Merge pull request #852 from samoht/master

New tentative fix for OCamlPro/opam#648