merge upstream, update vendor/exlib