Updated for Jenkins v1.584