update from jenkinsci:master