Fix for TRUNK-3818
Merge pull request #434 from tonybeing/master

Fix for TRUNK-3818