3214: Merge branch 'master' into 3214-permission-to-use-owner-uuid
authorTom Clegg <tom@curoverse.com>
Sat, 19 Jul 2014 00:45:27 +0000 (20:45 -0400)
committerTom Clegg <tom@curoverse.com>
Sat, 19 Jul 2014 00:45:27 +0000 (20:45 -0400)

Trivial merge