Merge branch 'master' into invite-dialog-jitsi

Fixes NullPointerException in conference invite dialog (ongoing work on
fixing missing contacts in invite dialog).
Merge branch 'master' of https://github.com/jitsi/jitsi