Merge https://github.com/garden20/gardener/commit/72a8b58f4db6.