electric indent mode
Merge remote-tracking branch 'origin/master' into arch_linux