Merge pull request #1685 from Stricted/patch3_1