Merge pull request #862 from dlobo/CRM-10682