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