Merge branch '3551-go-layout'
authorWard Vandewege <ward@curoverse.com>
Thu, 14 Aug 2014 19:29:36 +0000 (15:29 -0400)
committerWard Vandewege <ward@curoverse.com>
Thu, 14 Aug 2014 19:29:36 +0000 (15:29 -0400)
refs #3551


Trivial merge