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