K 10
svn:author
V 5
riggs
K 8
svn:date
V 27
2015-10-12T12:26:06.977848Z
K 7
svn:log
V 117
Update to upstream version 3.12.4

While on it:
Convert to OPTION helpers

PR:		203291
Submitted by:	pfg@FreeBSD.org

END