Merge branch 'master' into MC_LTL

Conflicts:
	buildtools/Cmake/DefinePackages.cmake

diff --cc buildtools/Cmake/DefinePackages.cmake
index e2e3abb,4708dd7..d163aaf
--- 1/buildtools/Cmake/DefinePackages.cmake
--- 2/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@@ -16,8 -16,6 +16,7 @@@ set(EXTRA_DIS
        src/xbt/backtrace_windows.c
        src/xbt/backtrace_dummy.c
        src/xbt/setset_private.h
-       src/xbt/parmap_private.h
 +      src/xbt/automatonparse_promela.c
        src/xbt/mmalloc/attach.c
        src/xbt/mmalloc/detach.c        
        src/xbt/mmalloc/keys.c