[xi.huang]

Hi Chris

I committed all my stuff 8 hours before. I will hold on to avoid conflicts.

Cheers,

[cdelashmutt]

Yes please. I didn't see too many differences, but you may notice some other things that I missed. Sorry if I clobbered a lot. Everything should be committed on my end now.

[theute]

Everything looks fine to me, i fixed what i found and synced with 2.6.

Thanks a lot Simon and Chris !