Ooyala 1.5.0
Merge pull request #2890 from twlopes/master

Ooyala 1.5.0