Merge pull request #13605 from cdown/ono
authorChris Down <chris@chrisdown.name>
Fri, 20 Sep 2019 16:10:34 +0000 (18:10 +0200)
committerGitHub <noreply@github.com>
Fri, 20 Sep 2019 16:10:34 +0000 (18:10 +0200)
Fixes for recent SIP work


Trivial merge