Column support (closes #4904)
Merge pull request #4096 from aeslaughter/columns-4094

Column support
Merge commit '895519294aa17602e06cb2ca7e8be4989d8fe15f'