Sync to latest version from chrisreloaded.