Merge branch 'master' into job-create-start

Conflicts:
	engine/engine.go
	engine/job.go
	utils_test.go