Even better mode-line.
Merge branch 'master' into data