Small change to use a real type.
Merge branch 'replication'