Remove space.
Fix indent.
Merge pull request #2342 from yui-knk/fix-indent

Fix indent.
Merge pull request #2341 from yui-knk/remove-space

Remove space.
Merge branch 'master' into iij