Merge pull request #898 from dlobo/CRM-10682