Fix tabs/spaces inconsistency.
Merge pull request #631 from kimgr/master

Fix tabs/spaces inconsistency.