Jenkins 16580

see https://issues.jenkins-ci.org/browse/JENKINS-16580