Merge pull request #7167 from cshoredaniel/pr-nut-more-fixes
authorHannu Nyman <hannu.nyman@iki.fi>
Sat, 24 Nov 2018 07:22:26 +0000 (09:22 +0200)
committerGitHub <noreply@github.com>
Sat, 24 Nov 2018 07:22:26 +0000 (09:22 +0200)
nut: Various fixes


Trivial merge