Merge pull request #1086 from davecivicrm/CRM-12271