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