sponsor update by NelleVaroquaux

squished and turned into one commit. Already updated the 0.13 earlier the week. This is just to update the 0.13 code as well.

From #1906