K 10
svn:author
V 6
kevans
K 8
svn:date
V 27
2018-02-11T20:35:14.580856Z
K 7
svn:log
V 128
Fix paths after r329132

This is a direct commit to stable/11 due to svn's handling of merging this
move being less than ideal.

END