Merge pull request #811 from davecivicrm/CRM-12510