Merge remote-tracking branch 'waldi/rsync-cleanup'