Merge branch 'master' into fix/selected-psuedo-class-getting-cleared

src/Avalonia.Visuals/Media/FontFamily.cs

@@ -77,10 +77,10 @@ namespace Avalonia.Media
         /// <summary>
         /// Implicit conversion of string to FontFamily
         /// </summary>
-        /// <param name="fontFamily"></param>
+        /// <param name="s"></param>
-        public static implicit operator FontFamily(string fontFamily)
+        public static implicit operator FontFamily(string s)
         {
-            return new FontFamily(fontFamily);
+            return Parse(s);
         }
 
         /// <summary>