Merge pull request #3678 from kenwest/CRM-14994