Merge branch 'master' into 2762-owner-uuid-integrity
authorTom Clegg <tom@curoverse.com>
Sun, 11 May 2014 20:30:53 +0000 (16:30 -0400)
committerTom Clegg <tom@curoverse.com>
Sun, 11 May 2014 20:30:53 +0000 (16:30 -0400)

Trivial merge