Make engine and text play nice
Merge branch 'master' of https://github.com/MetropoliaPortal/Engine