CRM-14095 - Fix bug where email token hook not called if no core tokens present
Merge pull request #2386 from colemanw/tokenFix

CRM-14095 - Fix bug where email token hook not called if no core tokens present