Adding test output to help debug random build failure
Merge remote-tracking branch 'origin/master'