Merge pull request #937 from jaimeMF/subtitles_rework