0.13dev: Ticket #6930: merged from 0.12-stable.
Authored by: ecarter 2011-03-16
Parent: [r10646]
Child: [r10648]