Implemented JENKINS-23533
Attempt at fixing failing unix test
Merged
Merge pull request #16 from MadsNielsen/master

Implemented JENKINS-23533