Merge pull request #885 from davecivicrm/CRM-12714