[mpv/el8] (6 commits) ...Merge branch 'master' into el8