merge master fix conflicts

lib/extract/extractClipping.js

@@ -1,4 +1,3 @@
-import SerializablePath from '../SerializablePath';
 import clipReg from './patternReg';
 
 const clipRules = {
@@ -17,6 +16,8 @@ export default function (props) {
 
         if (matched) {
             clippingProps.clipPath = matched[1];
+        } else {
+            console.warn('Invalid `clipPath` prop, expected a clipPath like `"#id"`, but got: "' + clipPath + '"');
         }
     }
 

lib/extract/extractStroke.js

@@ -20,10 +20,6 @@ export default function(props) {
 
     let strokeWidth = +props.strokeWidth;
 
-    if (_.isNil(props.strokeWidth)) {
-        strokeWidth = null;
-    }
-
     let strokeDasharray = props.strokeDasharray;
 
     if (typeof strokeDasharray === 'string') {
@@ -41,7 +37,7 @@ export default function(props) {
         strokeLinecap: caps[props.strokeLinecap] || 0,
         strokeLinejoin: joins[props.strokeLinejoin] || 0,
         strokeDasharray: strokeDasharray || null,
-        strokeWidth: strokeWidth,
+        strokeWidth: strokeWidth || null,
         strokeDashoffset: strokeDasharray ? (+props.strokeDashoffset || 0) : null,
         strokeMiterlimit: props.strokeMiterlimit || 4
     };