Merge remote-tracking branch 'chukong/master'