Merge branch 'master' of git://github.com/jenkinsci/jenkins
Merge branch 'master' of git://github.com/jenkinsci/jenkins