Merge pull request #3350 from qingling128/master