Merge remote-tracking branch 'waldi/managed-rsyncd-ports-master'