Merge change I962d468d into eclair

* changes:
  revise the deprecated warning to use the 'caution' style and add a line break