Merge branch 'sfr451258'
Merge branch 'V2.4.00maint' of github.com:Metaswitch/libjitsi into V2.4.00maint