Merge pull request #12292 from neheb/spoof
authorRosen Penev <rosenp@gmail.com>
Tue, 26 May 2020 21:08:58 +0000 (14:08 -0700)
committerGitHub <noreply@github.com>
Tue, 26 May 2020 21:08:58 +0000 (14:08 -0700)
[19.07] spoofer backports


Trivial merge