A little cleaner solution
Merge branch 'inline-subtitles' into subplayer