Merge pull request #1822 from rubenk/write_riemann-indent