Merge change I5ecba70c into eclair

* changes:
  add missing comma