Merge pull request #1 from tinyspeck/master

Merge in community changes
?
Merge pull request #8 from jenkinsci/master

Catch up with master release