synchronize Changes with 4.04 (#888)
synchronize Changes with 4.04 (#888)


msprotz/ocaml,msprotz/ocaml,msprotz/ocaml,gerdstolpmann/ocaml,gerdstolpmann/ocaml,gerdstolpmann/ocaml,msprotz/ocaml,yunxing/ocaml,yunxing/ocaml,yunxing/ocaml,gerdstolpmann/ocaml,gerdstolpmann/ocaml,yunxing/ocaml,yunxing/ocaml,msprotz/ocaml