merging with safemode branch -r12684
Authored by: safemode 2010-03-07
Parent: [r12684]
Child: [r12686]