[vlc/f26] (2 commits) ...Merge branch 'master' into f26