0.12dev now has all the changes it needs from 0.11-stable. 
0.12dev now has all the changes it needs from 0.11-stable. 

I had to merge a part of r7423 which couldn't apply in r7498, as r7390 was not merged by then.

pkdevbox/trac,pkdevbox/trac,pkdevbox/trac,pkdevbox/trac