[vlc/f31] (14 commits) ...Merge branch 'master' into f31