Merge branch 'master' into vmtrace

Conflicts:
	include/surf/simgrid_dtd.h
	src/surf/simgrid_dtd.c

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

diff --cc examples/msg/cloud/masterslave_virtual_machines.c
Simple merge

diff --cc include/msg/msg.h
Simple merge