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