[fixed] by xuheng
Merge remote-tracking branch 'origin/master'