[Backport] Indentation fixes.
Merge pull request #915 from timlinux/master

[Backport] Indentation fixes.