Removing a useless copy.
Merge branch 'master' into replication