Merge remote-tracking branch 'upstream/master' into master-build

* upstream/master:
  WinGui: Fix fast decode tune with x264 vs x265. #2083
2 jobs for master-build in 69 minutes and 51 seconds (queued for 20 minutes and 39 seconds)
Status Job ID Name Coverage
  Build
passed #209366769
linux
build_windows

01:02:01

 
  Build Gui
passed #209366770
windows msbuild
build_windows_gui

00:07:49