OK, this is just a pull with a patch provided in the JIRA. I won't have time to invest in it this time around, so we might just need to close this request and come back to it later with a fresh impl when time permits.

Cheers,
D.