Merge pull request #2117 from dlobo/CRM-13852