Mass tab, trailing and whitespace cleanup
Merge branch 'master' into devel