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