Merging from urho3d main repo