Merge pull request #17 from ooyala/appsplat-679

Appsplat 679