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