K 10
svn:author
V 2
np
K 8
svn:date
V 27
2015-12-03T00:15:03.587151Z
K 7
svn:log
V 77
Catch up with head, mostly to merge r291665 with the changes in this branch.

END