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