CRM-15354 - Fix undefined warning
Merge pull request #4242 from colemanw/CRM-15354

CRM-15354 - Fix undefined warning