[vlc/f33] (3 commits) ...Merge branch 'master' into f33