Hi Ivan, Thanks for reviewing the fixes for 1.10, backporting them to 1.9 and fixing(!) the issues that you have found.
I've reviewed your fixes and they are o.k. I also ported the relevant bits to the 1.10 branch such that we get all fixes into /trunk by simply merging the 1.10 branch. -- Stefan^2.

