jenkins WIP
Merge pull request #1982 from danmcp/master

Jenkins v2 WIP