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