Disable soft tabs (when did this happen?)
Merge branch 'master' into laptop