Merge pull request #7185 from remitamine/ooyala