Comment-out cursorcolumn
Merge branch 'master' into mac