Merge pull request #3848 from jp-bennett/master
authorTed Hess <redacted>
Mon, 16 Jan 2017 13:12:28 +0000 (08:12 -0500)
committerGitHub <redacted>
Mon, 16 Jan 2017 13:12:28 +0000 (08:12 -0500)
Fwknopd: Various updates


Trivial merge
git clone https://git.99rst.org/PROJECT