Merge branch 'master' into S4U

Conflicts:
	buildtools/Cmake/DefinePackages.cmake

diff --cc buildtools/Cmake/DefinePackages.cmake
index 5eee142,451dfe8..1dc9ef3
--- 1/buildtools/Cmake/DefinePackages.cmake
--- 2/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@@ -783,21 -766,6 +778,7 @@@ endif(
  ### Simgrid Lib sources
  set(simgrid_sources
    ${BINDINGS_SRC}
-   ${GTNETS_USED}
 +  ${S4U_SRC}
    ${MSG_SRC}
    ${SIMDAG_SRC}
    ${SIMGRID_SRC}

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