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