Merge branch 'local-ocamlbuild' into local-trunk