Merge remote-tracking branch 'jfrog/master'
Merge branch 'hudson-plugin'