Fixes issue JENKINS-14955
Merge pull request #23 from daldinger/master

Change for JENKINS-14955