backport of v2.1.0 to the ~1.1.0 line
back port of v2.1.0 to the ~1.1.0 line, doesn't include the transform changes because browserify streams are unconditionally imported in that version.
back port of v2.1.0 to the ~1.1.0 line, doesn't include the transform changes because browserify streams are unconditionally imported in that version.