CRM-15429
Merge pull request #206 from atif-shaikh/CRM-15429

CRM-15429