(Laura) fixed issue #184: renames are now handled correctly
Merge branch 'master' into mixed_clients