[Reviewer: Mike] Geo redundancy support

Mike,

Please can you review my changes to support geo-redundancy?  I think we've discussed these before, but please shout if you have any questions.

Matt