3551: Merge branch 'master' into 3551-go-layout
authorTom Clegg <tom@curoverse.com>
Thu, 14 Aug 2014 19:23:43 +0000 (15:23 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 14 Aug 2014 19:23:43 +0000 (15:23 -0400)

Trivial merge