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