Merge branch 'master' of github.com:jenkinsci/jenkins
Touch-ups for #914.
Merge REMERGE_HEAD into HEAD