Fixes CS-4815
Merge pull request #1 from terwey/patch-1

Fixes CS-4815