- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1680
Merge remote branch 'upstream/master'