BZ1078186
Merge pull request #531 from liweinan/1078186

BZ1078186