b70b1f99

Merge remote-tracking branch 'upstream/trunk' into doc-transcripts

Time to start	0s
Time from start to finish	28s
Time to finish	29s
Total worker time	27s