Fixes #2046
Merge pull request #2048 from bakercp/develop-clean

Fixes #2046