merge wuchong/master