Merge branch '7254-dont-lose-replication-arg' closes #7254
authorTom Clegg <tom@curoverse.com>
Wed, 7 Oct 2015 15:44:25 +0000 (11:44 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 7 Oct 2015 15:44:25 +0000 (11:44 -0400)

Trivial merge