Merge remote-tracking branch 'origin/master' into new_adaptive_algorithm
Conflicts: include/mediastreamer2/bitratecontrol.h src/voip/bitratecontrol.c src/voip/mediastream.c src/voip/qosanalyzer.c src/voip/videostream.c
Conflicts: include/mediastreamer2/bitratecontrol.h src/voip/bitratecontrol.c src/voip/mediastream.c src/voip/qosanalyzer.c src/voip/videostream.c