Merge pull request #2062 from dlobo/CRM-13806