Merge pull request #911 from mstorchak/rsync