merge 'merge-exceptions.patch' and add forgotten files

git-svn-id: http://caml.inria.fr/svn/ocaml/branches/open_types@14596 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02