bz916799
Merge pull request #256 from liweinan/BZ916799,trunk

bz916799