Merge pull request #7833 from remitamine/ooyala