Merge change I3834b1cb into eclair-mr2

* changes:
  support for multiline paragraph style indentation