avoid sending delete updates to the master server - first check if there is something to delete
Merge branch 'master' into rel0.10