Merge pull request #1412 from davecivicrm/CRM-13199