fix merge oops

that was causing `depend` task to fail
Merge remote-tracking branch 'origin/headless' into minimal

Conflicts:
	build.sbt