Merge pull request #1 from kaltura/master

Update from original