Merge pull request #3167 from ashie/remove-needless-tab