0.12dev: Merged [8635] from 0.11-stable.
Authored by: rblank 2009-10-03
Parent: [r8639]
Child: [r8641]