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