Merge remote-tracking branch 'diffycat/thvideo'