Merge pull request #6504 from annando/fix-fatal
authorHypolite Petovan <hypolite@mrpetovan.com>
Thu, 24 Jan 2019 01:59:55 +0000 (20:59 -0500)
committerGitHub <noreply@github.com>
Thu, 24 Jan 2019 01:59:55 +0000 (20:59 -0500)
Fix for several fatal errors


Trivial merge