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