Toggle whitespace markers. Clean up file indentations.
Merge remote-tracking branch 'origin/master'