Merge change I77af8135 into eclair-mr2

* changes:
  Fix Formatter.format's handling of Formattable.