CRM-14399 this is probably safer & less like to wind up @colemanw than the prev version on this line
Merge pull request #2789 from eileenmcnaughton/CRM-14399-master

CRM-14399 this is probably safer & less like to wind up @colemanw than t...