Merge pull request #1 from codecentric/master

Update lastest changes from Upstream
Merge pull request #17 from jenkinsci/master

Merge pull request #1 from codecentric/master