Use ocamlc, not ocamlopt.opt
Merge remote-tracking branch 'origin/master'