Merge remote-tracking branch 'upstream/master'
Remove redundant calls to #column