WIP

Conflicts:
	coreos/coreos-alpha.json