merge from tcmask/trunk r42 through r59
Authored by: stivosaurus 2010-06-10
Parent: [r59]
Child: [r61]