Merge branch 'rsync-shuffle'