Forgot that `typeof null === 'object'`

Added a check for this condition so that merge works correctly

diff --git a/src/Chart.Core.js b/src/Chart.Core.js
index 8034efabff04ae84fa974a9e233cbf3672f9b2af..fac8424b8873ac24dfa64f8a9501c085140c950a 100755 (executable)
--- a/src/Chart.Core.js
+++ b/src/Chart.Core.js
@@ -206,7 +206,7 @@
                                     baseArray.push(valueObj); // nothing to merge
                                 }
                             });
-                        } else if (base.hasOwnProperty(key) && typeof base[key] == "object" && typeof value == "object") {
+                        } else if (base.hasOwnProperty(key) && typeof base[key] == "object" && base[key] !== null && typeof value == "object") {
                             // If we are overwriting an object with an object, do a merge of the properties.
                             base[key] = helpers.configMerge(base[key], value);
                         } else {