Merge from master

you might have merge issues here, see the "readable-stream" is already specified above.