Merge pull request #265 from hhromic/master
authorhizzlekizzle <hizzlekizzle@users.noreply.github.com>
Thu, 28 Mar 2019 15:11:58 +0000 (10:11 -0500)
committerGitHub <noreply@github.com>
Thu, 28 Mar 2019 15:11:58 +0000 (10:11 -0500)
Sync upstream commits lost during recent PR squash


Trivial merge