bz899664
Merge pull request #515 from liweinan/BZ899664

BZ899664