Fix for KMS-2115
Merge pull request #10 from kaltura/2.2.5

Fix for KMS-2115