Merge pull request #7320 from remitamine/adobetv