Merge branch 'master' into MacNativeAudio
Merge branch 'MacNativeAudio' of github.com:Metaswitch/libjitsi into MacNativeAudio