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