[mpv/el8] (12 commits) ...rebase on master