Copying Merguez over from the private repo.