-- CRM-12682 applied patch and made some modifications
Merge pull request #916 from ravishnair/CRM-12682

-- CRM-12682 applied patch and made some modifications