FIXED JENKINS-19943 but credit should go to Nathan Kinder
Merge pull request #77 from jbrejner/master

FIXED JENKINS-19943 but credit should go to Nathan Kinder