Fix build
Merge branch 'master' of github.com:Metaswitch/libjitsi