merge from csong #29

Closed garlicbulb-puzhuo closed 7 years ago