Merge branch 'jk/drop-rsync-transport'