Not supporting older versions of jenkins anymore
Merge branch 'master' into template_refactor