Merge branch 'master' into fix-transitions

native/Avalonia.Native/src/OSX/window.mm

@@ -369,12 +369,9 @@ public:
 
     virtual void UpdateCursor()
     {
-        [View resetCursorRects];
         if (cursor != nil)
         {
-             auto rect = [Window frame];
+            [cursor set];
-             [View addCursorRect:rect cursor:cursor];
-             [cursor set];
         }
     }
     
@@ -425,6 +422,7 @@ private:
     {
         WindowEvents = events;
         [Window setCanBecomeKeyAndMain];
+        [Window disableCursorRects];
     }
     
     virtual HRESULT Show () override

src/Shared/PlatformSupport/AssetLoader.cs

@@ -242,6 +242,7 @@ namespace Avalonia.Shared.PlatformSupport
                     throw new InvalidOperationException(
                         $"Assembly {name} needs to be referenced and explicitly loaded before loading resources");
 #else
+                    name = Uri.UnescapeDataString(name);
                     AssemblyNameCache[name] = rv = new AssemblyDescriptor(Assembly.Load(name));
 #endif
                 }