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