Merge pull request #644 from davecivicrm/CRM-12507