Merge pull request #1 from bigbluebutton/master

Update from original