Merging safemode -r12740 to trunk, includes a evil little bug klauss committed to my branch (maybe by mistake?) and a commented place-holder for where shield colliding should go
Authored by: safemode 2010-03-19
Parent: [r12740]
Child: [r12742]