Fixes issue #5652
Merge pull request #5654 from stribert/develop

Fixes issue #5652