Merge branch '6203-locator-regexp' refs #6203 refs #6277
authorTom Clegg <tom@curoverse.com>
Tue, 9 Jun 2015 14:11:35 +0000 (10:11 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 9 Jun 2015 14:11:35 +0000 (10:11 -0400)

Trivial merge