Merge branch 'master' into 3551-go-layout
authorWard Vandewege <ward@curoverse.com>
Thu, 14 Aug 2014 19:25:04 +0000 (15:25 -0400)
committerWard Vandewege <ward@curoverse.com>
Thu, 14 Aug 2014 19:25:04 +0000 (15:25 -0400)

Trivial merge