Update

Note: --osd-font-size (and similar options) don't affect unstyled
      subtitles anymore. Now you have to use --sub-text-font-size etc.
      to change the appearance of unstyled subtitles.
Merge remote-tracking branch 'upstream/master'