Merge pull request #3418 from warpcode/develop

Fixes #3417