[vlc/f31: 14/14] Merge branch 'master' into f31