Merge branch 'master' of git.linphone.org:linphone

diff --git a/mediastreamer2 b/mediastreamer2
index 75eb1fcf8d6097e51bcb507be339dd397c6b4dd5..84b9ef050c6abd26446901c2532573f2589a435b 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 75eb1fcf8d6097e51bcb507be339dd397c6b4dd5
+Subproject commit 84b9ef050c6abd26446901c2532573f2589a435b

diff --git a/oRTP b/oRTP
index 41d13b7e491c7fc418987b63ff6ef80c7e8895a4..2590e21d864b43d6ac3a2ece0cf3b4d0e208e866 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 41d13b7e491c7fc418987b63ff6ef80c7e8895a4
+Subproject commit 2590e21d864b43d6ac3a2ece0cf3b4d0e208e866