Merge branch 'master' into disk

diff --cc include/simgrid/s4u/Engine.hpp
Simple merge

diff --cc include/simgrid/s4u/Host.hpp
Simple merge

diff --cc src/s4u/s4u_Engine.cpp
Simple merge

diff --cc src/s4u/s4u_Host.cpp
Simple merge

diff --cc src/surf/sg_platf.cpp
Simple merge

diff --cc src/surf/surf_c_bindings.cpp
Simple merge

diff --cc src/surf/surf_interface.cpp
Simple merge

diff --cc src/surf/xml/surfxml_sax_cb.cpp
Simple merge