Merge remote-tracking branch 'antranig/FLUID-6111'

* antranig/FLUID-6111:
  FLUID-6111: Test case and fix for faulty consideration that model with numeric property "length" is an array

src/framework/core/js/Fluid.js

@@ -436,7 +436,7 @@ var fluid = fluid || fluid_3_0_0;
     fluid.makeArray = function (arg) {
         var togo = [];
         if (arg !== null && arg !== undefined) {
-            if (fluid.isPrimitive(arg) || typeof(arg.length) !== "number") {
+            if (fluid.isPrimitive(arg) || fluid.isPlainObject(arg, true) || typeof(arg.length) !== "number") {
                 togo.push(arg);
             }
             else {

tests/framework-tests/core/js/DataBindingTests.js

@@ -811,6 +811,29 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         jqUnit.assertEquals("Just one listener registered", 1, that.listenerCount);
     });
 
+    /** FLUID-6111: Model merging with numeric property named "length" **/
+
+    fluid.defaults("fluid.tests.fluid6111head", {
+        gradeNames: "fluid.modelComponent",
+        model: {
+            name: "ABCD",
+            length: 14
+        }
+    });
+
+    jqUnit.test("FLUID-6111: Model merging with numeric property named \"length\"", function () {
+        var that = fluid.tests.fluid6111head({
+            model: {
+                duration: 34
+            }
+        });
+        var baseModel = {
+            name: "ABCD",
+            length: 14
+        };
+        jqUnit.assertLeftHand("Expected original model contents", baseModel, that.model);
+    });
+
     /** FLUID-5695: New-style multiple paths and namespaces for model listeners **/
 
     fluid.defaults("fluid.tests.fluid5695root", {