Adding Closed Caption support, see the changelist for details