BrightcoveOS/Diamond — pull request #497 by peterfisher (2014-01-02 13:52:18+00:00)
Title: bug fixes

sorry for all the commits, didn't notice upstream changes some how...