Merge pull request #4096 from DBendit/libbluray-fix