[vlc/f24] (3 commits) ...fixup