Merge pull request #1270 from ravishnair/CRM-13037