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)
commit588bf7918460109815d5cc505ada4334a4c5a791
tree0d1e3aefc4ec722dacb68d3c04e943af471fa223
parentc2e6be6ae317eaa6a70b27f4108aa8b3ac0c7869
parentce4cd3d539bbd593d543f2ead52e44fbf552dbc5
Merge pull request #265 from hhromic/master

Sync upstream commits lost during recent PR squash