Fix JENKINS-17733
Merge pull request #65 from stmontgomery/JENKINS-17733

Fix JENKINS-17733