Merge fix for https://github.com/garden20/gardener/issues/22.