Merge branch 'subtitles_rework' (closes PR #1326)