Merge pull request #1677 from rzhxeo/xtube