Fix for CRM-15264
Merge pull request #4084 from rohankatkar/CRM_15264

Fix for CRM-15264