Log more to track down a flaky test
Auto-merge remote-tracking branch 'upstream/master'