Merge branch 'output-indentation'