Merge branch 'master' into progressbar

Conflicts:
	src/main/java/se/diabol/jenkins/pipeline/PipelineFactory.java