Fix #527
Merge branch 'master' of github.com:OCamlPro/opam