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