[vlc/el7] (6 commits) ...Merge branch 'master' into el7