Merge pull request #3554 from candrews/patch-1 #3

Job	Run time
build (windows/amd64)	1m 41s
build (freebsd/amd64)	1m 46s
test-freebsd-amd64	18m 10s
test-windows-amd64 (containerd, ./client)	4m 26s
test-windows-amd64 (containerd, ./cmd/buildctl)	3m 53s
test-windows-amd64 (containerd, ./worker/containerd)	2m 15s
test-windows-amd64 (containerd, ./solver)	3m 9s
test-windows-amd64 (containerd, ./frontend)	1m 35s
test-windows-amd64 (containerd, ./frontend/dockerfile)	7m 12s
test-windows-amd64 (./..., 1)	12m 35s
	56m 42s

Provide feedback