Fix for JENKINS-24999
Merge pull request #1 from fbelzunc/master

Fix for JENKINS-24999