0.12dev: Merged [8161] from 0.11-stable, now that #G300 is fixed.
Authored by: rblank 2009-05-13
Parent: [r8198]
Child: [r8200]