CRM-12206
Merge pull request #315 from deepak-srivastava/beta

CRM-12206