Merge pull request #2109 from dlobo/CRM-13849