Updated to the latest changes from Tomrus.

Signed-off-by: SkyFire <admin@projectskyfire.org>