Merge pull request #15048 from eileenmcnaughton/5.17
authorSeamus Lee <seamuslee001@gmail.com>
Sun, 18 Aug 2019 03:33:12 +0000 (13:33 +1000)
committerGitHub <noreply@github.com>
Sun, 18 Aug 2019 03:33:12 +0000 (13:33 +1000)
Fix unreleased regression on import


Trivial merge