Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugins/janus_audiobridge.c