merge from tcmask trunk. Merging r59 through r70 (WZ trunk Rev 10986)
Authored by: stivosaurus 2010-06-17
Parent: [r70]
Child: [r72]