0.11.7dev: Backported [8982] from trunk.
Closes #8884.
Authored by: rblank 2009-12-30
Parent: [r8992]
Child: [r8994]