Merge branch 'edge'

diff --git a/mediastreamer2 b/mediastreamer2
index 0e62557bfedcb090b10c81697a41d6f1b3a85e1e..3078bac7ee1a234900b152f1f21aceb0f6a55645 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0e62557bfedcb090b10c81697a41d6f1b3a85e1e
+Subproject commit 3078bac7ee1a234900b152f1f21aceb0f6a55645

diff --git a/oRTP b/oRTP
index efe109e844b4049b5184d1246a42d83260529b94..fe897fd4c6d96a211b3a4ae4f9005b03144d1a66 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit efe109e844b4049b5184d1246a42d83260529b94
+Subproject commit fe897fd4c6d96a211b3a4ae4f9005b03144d1a66