[vlc/f33: 2/2] Merge branch 'master' into f33