Don't keep track of this directory either.
Remove unneeded whitespace, convert tabs into spaces.
Merge branch 'upstream_code_cleanup'