break out fields in event fired instead of parsing out of plain text
Merge pull request #10152 from erchn/develop

break out fields in event fired instead of parsing out of plain text