Merge branch 'master' of https://github.com/photonstorm/phaser

Author: bitnenfer

src/gameobjects/GameObject.js

@@ -296,7 +296,7 @@ var GameObject = new Class({
         //  TODO Keep a reference to the manager in Body, so body can remove itself, not via System
         if (this.body)
         {
-            sys.physicsManager.remove(this);
+            // sys.physicsManager.remove(this);
 
             this.body = undefined;
         }

src/loader/MergeXHRSettings.js

@@ -1,3 +1,4 @@
+var Extend = require('../utils/object/Extend');
 var XHRSettings = require('./XHRSettings');
 
 //  Takes two XHR Objects and creates a new object
@@ -7,7 +8,7 @@ var XHRSettings = require('./XHRSettings');
 
 var MergeXHRSettings = function (global, local)
 {
-    var output = (global === undefined) ? XHRSettings() : Object.assign(global);
+    var output = (global === undefined) ? XHRSettings() : Extend(global);
 
     if (local)
     {