This includes an apache-httpd bump, but that can be cherry-picked away since that's in another branch already.