#PS-1306 #comment fix for android 4 limitation
Merge branch '2.11-Jun-15' into PS-1306
Merge pull request #686 from kaltura/PS-1306

Ps 1306