[vlc/el7: 40/40] Merge branch 'master' into el7