Pulling Upstream Changes and Fixing Merge

Source/Basic Shapes/SvgVisualElement.cs

@@ -163,7 +163,7 @@ namespace Svg
                     if (this.StrokeDashArray != null && this.StrokeDashArray.Count > 0)
                     {
                         /* divide by stroke width - GDI behaviour that I don't quite understand yet.*/
-                        pen.DashPattern = this.StrokeDashArray.ConvertAll(u => u.Value/((strokeWidth <= 0) ? 1 : strokeWidth)).ToArray();
+                        pen.DashPattern = this.StrokeDashArray.ConvertAll(u => ((u.Value <= 0) ? 1 : u.Value) / ((strokeWidth <= 0) ? 1 : strokeWidth)).ToArray();
                     }
 
                     renderer.DrawPath(pen, this.Path);
@@ -247,4 +247,4 @@ namespace Svg
         }
 
     }
-}
+}
\ No newline at end of file

Source/Basic Shapes/SvgVisualElementStyle.cs

@@ -294,11 +294,11 @@ namespace Svg
                     {
                         case FontParseState.fontFamilyNext:
                             this.FontFamily = string.Join(" ", parts, i + 1, parts.Length - (i + 1));
-                            i = int.MaxValue;
+                            i = int.MaxValue - 2;
                             break;
                         case FontParseState.fontFamilyCurr:
                             this.FontFamily = string.Join(" ", parts, i, parts.Length - (i));
-                            i = int.MaxValue;
+                            i = int.MaxValue - 2;
                             break;
                     }
 

Source/Paths/SvgClosePathSegment.cs

@@ -8,6 +8,7 @@ namespace Svg.Pathing
     {
         public override void AddToPath(System.Drawing.Drawing2D.GraphicsPath graphicsPath)
         {
+
             // Important for custom line caps.  Force the path the close with an explicit line, not just an implicit close of the figure.
             if (graphicsPath.PointCount > 0 && !graphicsPath.PathPoints[0].Equals(graphicsPath.PathPoints[graphicsPath.PathPoints.Length - 1]))
             {

Source/Text/SvgTextSpan.cs

@@ -10,7 +10,6 @@ namespace Svg
     [SvgElement("tspan")]
 	public class SvgTextSpan : SvgTextBase
     {
-
 		public override SvgElement DeepCopy()
 		{
 			return DeepCopy<SvgTextSpan>();