Merge pull request #739 from dlobo/CRM-12607