[vlc/f25] (11 commits) ...Merge remote-tracking branch 'origin/master' into f25