Merge change I7c7b1596 into eclair

* changes:
  Fix a warning output.