Merge remainder of Shane's patch on #8184
Authored by: thatch 2009-04-01
Parent: [r8030]
Child: [r8032]