[npapi-vlc/f26] (3 commits) ...Fixup