Merge remote-tracking branch 'waldi/srv-mirrors'