Merge "Make $wgMWLoggerDefaultSpi more expressive"