Fix joining participant issues #295
Merge branch 'master' into session-video-mute