Merge pull request #7176 from remitamine/megavideoz