Merge branch '3551-go-layout' closes #3551
authorTom Clegg <tom@curoverse.com>
Thu, 14 Aug 2014 19:30:28 +0000 (15:30 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 14 Aug 2014 19:30:28 +0000 (15:30 -0400)

Trivial merge