Update vendored deps (on master this time)

Same as #1874, but this time merging into master.

cc @creack and @crosbymichael