OCaml v3.12 support
Merge branch 'master' of https://github.com/sysdig-bla/simulateur

Conflicts:
	Makefile