0.12dev: Merged [8703,8704] from 0.11-stable.
Authored by: rblank 2009-10-27
Parent: [r8704]
Child: [r8706]