[vlc/f34: 3/3] Merge branch 'master' into f34