Fix formatting.
Merge remote-tracking branch 'origin/junit-output'