CRM-13011 : applied the patch
Merge pull request #1138 from pratik-joshi/CRM-13011

CRM-13011 : applied the patch