Merge pull request #2035 from dlobo/CRM-13793