0.12dev: Merged [8916,8994] from 0.11-stable and prevented [8993] from being merged.
Authored by: rblank 2009-12-31
Parent: [r8994]
Child: [r8996]