Merge pull request #3317 from mrunge/check_fixes
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 16 Oct 2019 11:18:12 +0000 (13:18 +0200)
committerGitHub <noreply@github.com>
Wed, 16 Oct 2019 11:18:12 +0000 (13:18 +0200)
Merge check fixes from 5.9 branch to master


Trivial merge