Changes to get the MT engine compiling again.
Authored by: tswift 2016-02-07
Parent: [r8628]
Child: [r8630]