Merge pull request #8876 from remitamine/html5_media