Merge pull request #15192 from demeritcowboy/locate-name-or-label-2
authorEileen McNaughton <emcnaughton@wikimedia.org>
Mon, 2 Sep 2019 20:49:11 +0000 (08:49 +1200)
committerGitHub <noreply@github.com>
Mon, 2 Sep 2019 20:49:11 +0000 (08:49 +1200)
dev/core#1046 - simplify logic


Trivial merge