Merge pull request #3848 from jp-bennett/master
authorTed Hess <thess@kitschensync.net>
Mon, 16 Jan 2017 13:12:28 +0000 (08:12 -0500)
committerGitHub <noreply@github.com>
Mon, 16 Jan 2017 13:12:28 +0000 (08:12 -0500)
Fwknopd: Various updates


Trivial merge