Merge remote-tracking branch 'upstream/master' into master-build
* upstream/master: WinGui: Add missing .ass extension to subtitle import WinGui: Clean-up the preset archive code. New filename format for archive files is presets.json.version.archive to make it easier to identify what preset version it came from. i.e. presets.json.36_0_0.archive WinGui: Improvements for #2090 - Support upgrading presets from 1.2.2 and later. Preset importer required some fixes to allow this to operate. - Changed Import Presets function to ignore built-in presets when the user tries to import the presets.json file. Cuts down on the volume of errors they'll get doing so.