Merge pull request #4844 from fritsch/gotham-backport-fix-dvdplayer