Merge branch 'master' into scheduler

Conflicts:
	harpoon-scheduler/shepherd.go
	harpoon-scheduler/transformer.go
	harpoon-scheduler/transformer_test.go