CRM-12490
Merge pull request #637 from deepak-srivastava/mastro

CRM-12490