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