commit by liu.wenju 20130407