[JENKINS-25533] Noting merge of #1477.
Merge branch 'master' of git://github.com/jenkinsci/jenkins