K 10
svn:author
V 3
kib
K 8
svn:date
V 27
2019-05-15T20:44:27.298902Z
K 7
svn:log
V 100
Fix mismerge.

Pointy hat to:	kib
Tested by: so (emaste, gtetlow)
Approved by: so (emaste, gtetlow)

END