set nostartofline
Merge branch 'master' into laziness (set nostartofline)