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

Conflicts:
	mediastreamer2

diff --cc configure.ac
Simple merge

diff --cc coreapi/Makefile.am
Simple merge

diff --cc coreapi/linphonecore.c
Simple merge

diff --cc coreapi/linphonecore.h
Simple merge

diff --cc mediastreamer2
index 4ae0903143af9ab2d149909e8ac66ca600119e4a,26f255173f3ec9ccaf5b1edece25b9e797fa560b..e52635ac0d64eeec2670ce05566644fe5f296a47
--- 1/mediastreamer2
--- 2/mediastreamer2
+++ b/mediastreamer2
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 4ae0903143af9ab2d149909e8ac66ca600119e4a
 -Subproject commit 26f255173f3ec9ccaf5b1edece25b9e797fa560b
++Subproject commit e52635ac0d64eeec2670ce05566644fe5f296a47