Introduce -maxColumns option
Merge remote-tracking branch 'remotes/origin/max-columns'