Merge pull request #144 from nirmata/cve-fix-1.10-1

Merge pull request #144 from nirmata/cve-fix-1.10-1 #856