Merge pull request #3882 from annando/config-null
authorHypolite Petovan <mrpetovan@gmail.com>
Wed, 8 Nov 2017 13:21:23 +0000 (08:21 -0500)
committerGitHub <noreply@github.com>
Wed, 8 Nov 2017 13:21:23 +0000 (08:21 -0500)
Still some more places with config stuff


Trivial merge