Merge pull request #7052 from remitamine/engadget