Merge pull request #15401 from seamuslee001/master
authorSeamus Lee <seamuslee001@gmail.com>
Sun, 6 Oct 2019 07:49:43 +0000 (09:49 +0200)
committerGitHub <noreply@github.com>
Sun, 6 Oct 2019 07:49:43 +0000 (09:49 +0200)
Master / 5.19 version of #15392


Trivial merge