Merge pull request #2072 from dlobo/CRM-13815