Fix XS diagnostic typo
Merge remote-tracking branch 'origin/master': t+