Merge remote-tracking branch 'apache/master' into 37-export-segment-test-failures-on-windows