These commits create compatibility with MT/MTG 5.0.0+. However, these commits may/will break with the 0.4-series.
