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

diff --cc src/mc/api.cpp
Simple merge

diff --cc src/mc/checker/CommunicationDeterminismChecker.cpp
Simple merge

diff --cc src/mc/checker/SafetyChecker.cpp
Simple merge