From 35c30a1bcffcc9a9b3a7c94e0b215d293c0ce193 Mon Sep 17 00:00:00 2001
From: Vladimir Agafonkin <agafonkin@gmail.com>
Date: Tue, 9 Aug 2016 17:51:17 +0300
Subject: [PATCH] upgrade deps

---
 package.json                | 18 +++++++++---------
 src/layer/tile/GridLayer.js |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 6bf2efa8..1cab4b53 100644
--- a/package.json
+++ b/package.json
@@ -3,24 +3,24 @@
   "version": "1.0.0-rc.3",
   "description": "JavaScript library for mobile-friendly interactive maps",
   "devDependencies": {
-    "eslint": "^2.11.1",
+    "eslint": "^3.2.2",
     "eslint-config-mourner": "^2.0.1",
     "git-rev": "^0.2.1",
     "happen": "~0.3.1",
     "jake": "~8.0.12",
-    "karma": "~0.13.22",
+    "karma": "~1.1.2",
     "karma-chrome-launcher": "^1.0.1",
-    "karma-coverage": "~1.0.0",
+    "karma-coverage": "~1.1.1",
     "karma-firefox-launcher": "~1.0.0",
-    "karma-mocha": "~1.0.1",
-    "karma-phantomjs-launcher": "^1.0.0",
+    "karma-mocha": "~1.1.1",
+    "karma-phantomjs-launcher": "^1.0.1",
     "karma-safari-launcher": "~1.0.0",
-    "leafdoc": "^1.3.1",
-    "mocha": "~2.5.3",
-    "phantomjs-prebuilt": "^2.1.7",
+    "leafdoc": "^1.4.0",
+    "mocha": "~3.0.2",
+    "phantomjs-prebuilt": "^2.1.11",
     "prosthetic-hand": "^1.3.1",
     "source-map": "^0.5.6",
-    "uglify-js": "~2.6.2"
+    "uglify-js": "~2.7.0"
   },
   "main": "dist/leaflet-src.js",
   "style": "dist/leaflet.css",
diff --git a/src/layer/tile/GridLayer.js b/src/layer/tile/GridLayer.js
index 2cfd67dc..9cf09244 100644
--- a/src/layer/tile/GridLayer.js
+++ b/src/layer/tile/GridLayer.js
@@ -129,7 +129,7 @@ L.GridLayer = L.Layer.extend({
 	},
 
 	initialize: function (options) {
-		options = L.setOptions(this, options);
+		L.setOptions(this, options);
 	},
 
 	onAdd: function () {