CRM-15615
Merge pull request #4764 from rohankatkar/CRM-15615

Fix for CRM-15615