merge tcmask/trunk rev 84. synced with WZ trunk Rev: 11078
Authored by: stivosaurus 2010-06-29
Parent: [r84]
Child: [r86]