Better subtitles (the size is dynamic and they are always at the bottom of the video).
Merge remote-tracking branch 'origin/master'