Merge pull request #694 from ravishnair/CRM-12528