Merge pull request #4128 from tangdou1/patch-1