Hi

These two patches are a bit of a warmup for another pass at streamable
subtitles. FATE passes.

/Tomas