prepare for release according to https://wiki.jenkins-ci.org/display/JENKINS/Hosting+Plugins
Merge remote-tracking branch 'upstream/master'