Fix for Jenkins Issue ID JENKINS-16561