K 10
svn:author
V 5
markj
K 8
svn:date
V 27
2020-07-16T13:50:21.205850Z
K 7
svn:log
V 88
Fix a mismerge in r363243.

This is a direct commit to stable/12.

Reported by:	Jenkins

END