Kris, as far I could see your patch is applied in current trunk, and the derived bugs on apply fixed.
Kris, as far I could see your patch is applied in current trunk, and the derived bugs on apply fixed.