Merge pull request #2479 from ckdarby/develop

Fixes #2340