K 10
svn:author
V 3
gjb
K 8
svn:date
V 27
2016-01-05T20:53:59.610084Z
K 7
svn:log
V 103
Final merge from head, before mergeing this branch back to head.

Sponsored by:	The FreeBSD Foundation

END