Merge branch '3551-go-layout'
authorWard Vandewege <ward@curoverse.com>
Thu, 14 Aug 2014 20:00:28 +0000 (16:00 -0400)
committerWard Vandewege <ward@curoverse.com>
Thu, 14 Aug 2014 20:00:28 +0000 (16:00 -0400)
refs #3551


Trivial merge