Merge rsync+ patch from Jos Backus onto a side branch.