[vlc/f24] (4 commits) ...Fixup from a lost commit