Conduit_resolver ocamldoc
Merge branch 'master' into gh-pages
sync ocamldoc