Really, please do merge this one

I've already tagged v0.0.39 off this, but we should merge it.

cc @jbuck