Merge pull request #3819 from arnova/subtitles_for_stacks