added alias
Merge branch 'master' into no_plugins
re- enabled listchars
Merge branch 'master' into no_plugins