BZ1078186
Merge pull request #530 from liweinan/Branch_2_3-1078186

BZ1078186-Branch_2_3