merge from tcmask/trunk r43 through r58
Authored by: stivosaurus 2010-06-10
Parent: [r58]
Child: [r60]