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