Fixing compilation warning on bad type.
Merge branch 'master' into replication