Fix for JENKINS-14725
Merge pull request #24 from fbelzunc/master

[FIXED JENKINS-14725]