Fix for SITE-491
Merge pull request #323 from terwey/SITE-491

Fix for SITE-491