Latest from CloudBees upstream