Merge branch 'master' of framagit.org:simgrid/simgrid

diff --cc CMakeLists.txt
Simple merge

diff --cc examples/python/actor-suspend/actor-suspend.py
Simple merge

diff --cc examples/s4u/actor-suspend/s4u-actor-suspend.cpp
Simple merge

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

diff --cc src/bindings/python/simgrid_python.cpp
Simple merge

diff --cc src/kernel/context/Context.hpp
Simple merge

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

diff --cc src/simix/ActorImpl.cpp
Simple merge

diff --cc src/simix/libsmx.cpp
Simple merge

diff --cc teshsuite/s4u/actor/actor.cpp
Simple merge