0.13dev: Merged from 0.12-stable.
(OT: My 1000th commit to Trac, yay! Ok, not the most glorious one :)
Authored by: rblank 2011-03-15
Parent: [r10643]
Child: [r10645]