Merge pull request #2725 from foolscap/subtitles-error-fix