Merge branch 'master' into 'master'

# Conflicts:
#   docs/source/ns3.rst
#   src/surf/network_ns3.cpp

diff --cc docs/source/ns3.rst
Simple merge

diff --cc src/kernel/routing/RoutedZone.cpp
index 40a7851,7619377..ef8ea10
--- 1/src/kernel/routing/RoutedZone.cpp
--- 2/src/kernel/routing/RoutedZone.cpp
+++ b/src/kernel/routing/RoutedZone.cpp
@@@ -169,12 -169,11 +169,12 @@@ void RoutedZone::add_route_check_params
      xbt_assert(dst, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, dstName);
      xbt_assert(not link_list.empty(), "Empty route (between %s and %s) forbidden.", srcName, dstName);
      xbt_assert(not src->is_netzone(),
-                "When defining a route, src cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?",
+                "When defining a route, src cannot be a netzone such as '%s'. Did you meant to have a NetzoneRoute?",
                 srcName);
      xbt_assert(not dst->is_netzone(),
-                "When defining a route, dst cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?",
+                "When defining a route, dst cannot be a netzone such as '%s'. Did you meant to have a NetzoneRoute?",
                 dstName);
 +    s4u::NetZone::on_route_creation(symmetrical, src, dst, gw_src, gw_dst, link_list);
    } else {
      XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", srcName, gw_src->get_cname(), dstName, gw_dst->get_cname());
      xbt_assert(src->is_netzone(), "When defining a NetzoneRoute, src must be a netzone but '%s' is not", srcName);

diff --cc src/kernel/routing/WifiZone.cpp
Simple merge

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