Code formatting: Remove stray tabs
Merge remote-tracking branch 'origin/master'