Incorporated Nicolas' https://github.com/jenkinsci/winstone/pull/13