Batch

@vouillon, do you think https://github.com/ocsigen/js_of_ocaml/commit/e23c74630e197210fc0b2cfdda620115d1250962 is mergeable  ?