Fix for CRM-15332
Merge pull request #4198 from sunilpawar/CRM-15332

Fix for CRM-15332