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

Author: photonstorm

src/gameobjects/rendertexture/RenderTexture.js

@@ -141,7 +141,7 @@ var RenderTexture = new Class({
      */
     destroy: function ()
     {
-        GameObject.destroy.call(this);
+        GameObject.prototype.destroy.call(this);
 
         if (this.renderer.type === CONST.WEBGL)
         {

src/tilemaps/staticlayer/StaticTilemapLayer.js

@@ -220,8 +220,8 @@ var StaticTilemapLayer = new Class({
         var tileset = this.tileset;
         var mapWidth = this.layer.width;
         var mapHeight = this.layer.height;
-        var width = tileset.image.get().width;
-        var height = tileset.image.get().height;
+        var width = tileset.image.source[0].width;
+        var height = tileset.image.source[0].height;
         var mapData = this.layer.data;
         var renderer = this.renderer;
         var tile;