Merge pull request #1296 from dlobo/CRM-13090