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

* upstream/master:
  audio_resample: set input and output samplerate
  MacGui: correct the HBEncodeLogLocation key. Fix #2220.
4 jobs for master-build in 53 minutes and 9 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #266456161
linux
build_windows

00:53:07

 
  Build Gui
failed #271121140
windows msbuild
build_windows_gui

00:00:02

failed #271119303
msbuild windows
build_windows_gui

00:00:02

failed #266456162
windows msbuild
build_windows_gui

00:00:01

 
Name Stage Failure
failed
build_windows_gui Build Gui
Using Shell executor...
Running on DEVBUILD...
Fetching changes...
Initialized empty Git repository in C:/Builds/builds/kRcrLTiP/0/frederickding/HandBrake/.git/
Created fresh repository.
fatal: unable to access 'https://gitlab-ci-token:[MASKED]@gitlab.com/frederickding/HandBrake.git/': error setting certificate verify locations:
CAfile: C:\Builds\builds\kRcrLTiP\0\frederickding\HandBrake.tmp\CI_SERVER_TLS_CA_FILE
CApath: none
ERROR: Job failed: exit status 128