Merge pull request #1203 from davecivicrm/CRM-12700