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