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