Merge pull request #566 from dlobo/CRM-12449