Merge branch 'master' into mc

diff --cc buildtools/Cmake/DefinePackages.cmake
Simple merge

diff --cc include/xbt/mmalloc.h
Simple merge

diff --cc src/mc/mc_compare.c
Simple merge

diff --cc src/xbt/log.c
Simple merge