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

Author: photonstorm

src/tilemaps/components/GetTileAt.js

@@ -27,7 +27,7 @@ var GetTileAt = function (tileX, tileY, nonNull, layer)
 
     if (IsInLayerBounds(tileX, tileY, layer))
     {
-        var tile = layer.data[tileY][tileX];
+        var tile = layer.data[tileY][tileX] || null;
         if (tile === null)
         {
             return null;

src/tilemaps/components/RemoveTileAt.js

@@ -30,7 +30,7 @@ var RemoveTileAt = function (tileX, tileY, replaceWithNull, recalculateFaces, la
     if (recalculateFaces === undefined) { recalculateFaces = true; }
     if (!IsInLayerBounds(tileX, tileY, layer)) { return null; }
 
-    var tile = layer.data[tileY][tileX];
+    var tile = layer.data[tileY][tileX] || null;
     if (tile === null)
     {
         return null;