Fixed FB11500
Final fix for JENKINS-23920
Merge pull request #10 from MadsNielsen/FB11500

Fixing JENKINS-23920