d3d merges

[Ann and Jason Edmeades]

Thanks Raphael for doing that, as I hadnt had chance to merge in your
changes.

BTW Did I read right that Alexander is away for 3 weeks...!
He'll have a nice workload when he gets back :-)

Jason