Merge pull request #1161 from Soul1355/master

fixed 7bf87ac2c0c510bcee566273cdf83e3aad4d4db0
Auto generated commit for version 3.1.119.260-Test
Auto generated commit for version 3.1.120.260