Merge remote-tracking branch 'naglis/tudou_fix'