am 413eed9e: am ed8d33b7: Merge change I5ec249ab into eclair-mr2

Merge commit '413eed9eb4fa8e3b76be46be3eb6e92675d423d4'

* commit '413eed9eb4fa8e3b76be46be3eb6e92675d423d4':
  More elimination of Formatter (I was tired of waiting several