merge in updates from tundra-urho3d master