Fix for JENKINS-20025
Merge pull request #26 from cjbush/master

Fix for JENKINS-20025