Merge remote-tracking branch 'origin/master' into dev_videoios

Conflicts:
	mediastreamer2
	oRTP

diff --cc coreapi/linphonecore.c
Simple merge

diff --cc coreapi/linphonecore.h
Simple merge

diff --cc mediastreamer2
index e52635ac0d64eeec2670ce05566644fe5f296a47,81d090ad2987cf990161e5e20f3d3f2ce81c12d3..279c7874e94cfd5d8dfc36a0d61eaf6d2acc6f4c
--- 1/mediastreamer2
--- 2/mediastreamer2
+++ b/mediastreamer2
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e52635ac0d64eeec2670ce05566644fe5f296a47
 -Subproject commit 81d090ad2987cf990161e5e20f3d3f2ce81c12d3
++Subproject commit 279c7874e94cfd5d8dfc36a0d61eaf6d2acc6f4c