Merge branch 'stable'

diff --combined MANIFEST.in
index 9ea1765,4ac8996..d000497
--- 1/MANIFEST.in
--- 2/MANIFEST.in
+++ b/MANIFEST.in
@@@ -124,10 -124,6 +124,10 @@@ include examples/c/plugin-host-load/plu
  include examples/c/plugin-host-load/plugin-host-load.tesh
  include examples/c/synchro-semaphore/synchro-semaphore.c
  include examples/c/synchro-semaphore/synchro-semaphore.tesh
 +include examples/cpp/activity-testany/s4u-activity-testany.cpp
 +include examples/cpp/activity-testany/s4u-activity-testany.tesh
 +include examples/cpp/activity-waitany/s4u-activity-waitany.cpp
 +include examples/cpp/activity-waitany/s4u-activity-waitany.tesh
  include examples/cpp/actor-create/s4u-actor-create.cpp
  include examples/cpp/actor-create/s4u-actor-create.tesh
  include examples/cpp/actor-create/s4u-actor-create_d.xml
@@@ -1917,7 -1913,6 +1917,6 @@@ include docs/source/tuto_network_calibr
  include docs/source/tuto_network_calibration/fig/pingpong_simgrid.png
  include docs/source/tuto_network_calibration/isend_ckmeans.json
  include docs/source/tuto_network_calibration/isend_dhist.json
- include docs/source/tuto_network_calibration/network_calibration_tutorial.ipynb
  include docs/source/tuto_network_calibration/network_calibration_tutorial.rst
  include docs/source/tuto_network_calibration/pingpong_ckmeans.json
  include docs/source/tuto_network_calibration/pingpong_dhist.json