Merge branch '6358-put-rendezvous' closes #6358
authorTom Clegg <tom@curoverse.com>
Mon, 19 Oct 2015 19:29:28 +0000 (15:29 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 19 Oct 2015 19:29:28 +0000 (15:29 -0400)

Trivial merge