am 3f8e158a: am d2c494d9: Merge change I8b2e000c into eclair

Merge commit '3f8e158a9dd27cc4c02be4e55fd51670563217d5'

* commit '3f8e158a9dd27cc4c02be4e55fd51670563217d5':
  add class description and revise descriptions for