Merge Janinko into jenkins-ci