#FEC-892 #time 1h #comment currently set to 10 - please review
Merge branch 'master' of https://github.com/kaltura/player-studio