incorporate -r12652 changes prior to merging back to trunk so they're not lost
Authored by: safemode 2010-02-27
Parent: [r12652]
Child: [r12654]