Merge remote-tracking branch 'upstream/1.0' into 1.1

Author: pontusmelke

gulpfile.js

@@ -216,7 +216,7 @@ gulp.task('run-tck', ['download-tck', 'nodejs'], function() {
     return gulp.src(featureHome + "/*").pipe(cucumber({
         'steps': 'test/v1/tck/steps/*.js',
         'format': 'pretty',
-        'tags' : ['~@fixed_session_pool', '~@db', '~@equality', '~@streaming_and_cursor_navigation', '~@tls']
+        'tags' : ['~@fixed_session_pool', '~@db', '~@equality', '~@streaming_and_cursor_navigation']
     }));
 });
 

package.json

@@ -20,7 +20,7 @@
     "babel": "^5.8.23",
     "babelify": "^6.3.0",
     "browserify": "^11.0.0",
-    "esdoc": "0.4.6",
+    "esdoc": "^0.4.0",
     "esdoc-importpath-plugin": "0.0.1",
     "glob": "^5.0.14",
     "gulp": "^3.9.1",