Merge fix from debian build machine.