Merge branch '3.5' into 3.6

Author: mbroadst

lib/core/cursor.js

@@ -359,15 +359,6 @@ class CoreCursor extends Readable {
         return this.push(this.cursorState.streamOptions.transform(result));
       }
 
-      // If we provided a map function
-      if (
-        this.cursorState.transforms &&
-        typeof this.cursorState.transforms.doc === 'function' &&
-        result != null
-      ) {
-        return this.push(this.cursorState.transforms.doc(result));
-      }
-
       // Return the result
       this.push(result);
 

lib/cursor.js

@@ -818,6 +818,7 @@ class Cursor extends CoreCursor {
         driver: true
       });
     }
+
     return maybePromise(this, callback, cb => {
       const cursor = this;
       const items = [];
@@ -845,12 +846,6 @@ class Cursor extends CoreCursor {
           // Get all buffered objects
           if (cursor.bufferedCount() > 0) {
             let docs = cursor.readBufferedDocuments(cursor.bufferedCount());
-
-            // Transform the doc if transform method added
-            if (cursor.s.transforms && typeof cursor.s.transforms.doc === 'function') {
-              docs = docs.map(cursor.s.transforms.doc);
-            }
-
             Array.prototype.push.apply(items, docs);
           }