Merge pull request #5445 from akallabeth/some_small_patches
authorDavid Fort <contact@hardening-consulting.com>
Tue, 25 Jun 2019 09:23:00 +0000 (11:23 +0200)
committerGitHub <noreply@github.com>
Tue, 25 Jun 2019 09:23:00 +0000 (11:23 +0200)
Fix various small issues


Trivial merge