Merge df85a43fc6 into bc05cb80dc

package.json

@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "chai": "3.4.0",
-    "eslint": "1.7.3",
+    "eslint": "1.8.0",
     "mocha": "^2.1.0",
     "zuul": "^3.7.0"
   },