FYI,

I've checked in the attached. 5.1 and trunk.

Andrew