Merge pull request #15293 from ixiam/dev#issue-826
authorMatthew Wire <mjw@mjwconsult.co.uk>
Sun, 13 Oct 2019 15:33:26 +0000 (16:33 +0100)
committerGitHub <noreply@github.com>
Sun, 13 Oct 2019 15:33:26 +0000 (16:33 +0100)
dev/core#826


Trivial merge