Merge remote-tracking branch 'waldi/rsyncd-unify'