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