Merge branch '8082-col-markup' refs #8082
authorTom Clegg <tom@curoverse.com>
Mon, 4 Jan 2016 17:58:17 +0000 (12:58 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 4 Jan 2016 17:58:17 +0000 (12:58 -0500)

Trivial merge