Merge pull request #2789 from pyhalov/xorriso