Merge pull request #591 from davecivicrm/CRM-12482