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

diff --cc CMakeLists.txt
Simple merge

diff --cc ChangeLog
index 7dd1b9a,a84b49e..1f670a5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -2,7 -2,7 +2,8 @@@ SimGrid (3.23) NOT RELEASED (Release Ta
  
  General:
   - Stop setting random seed with srand48() at initialization.
 + - Use addr2line as a fallback for stacktraces when backtrace is not available.
+  - Build option -Denable_documentation is now OFF by default.
  
  XBT:
   - New log appenders: stdout and stderr. Use stdout for xbt_help.