[vlc/f25] (17 commits) ...Merge branch 'master' into f25