Fix indentation (issue #1948)
Merge remote-tracking branch 'origin/issue1948' into issue1948