Merge branch 'master' into greenkeeper/@types/gulp-mocha-0.0.30

package.json

@@ -32,12 +32,12 @@
     "@types/debug": "0.0.29",
     "@types/elasticsearch": "5.0.13",
     "@types/escape-html": "0.0.19",
-    "@types/event-stream": "3.3.30",
+    "@types/event-stream": "3.3.31",
     "@types/express": "4.0.35",
     "@types/glob": "5.0.30",
     "@types/gm": "1.17.30",
-    "@types/gulp": "4.0.1",
     "@types/gulp-mocha": "0.0.30",
+    "@types/gulp": "4.0.2",
     "@types/gulp-rename": "0.0.31",
     "@types/gulp-tslint": "3.6.30",
     "@types/gulp-typescript": "0.0.32",