for 24.3.1 modeline -> mode-line (jesus)
Merge branch 'master' into gavin