Merge branch '9773-faster-find-or-create'
authorTom Clegg <tom@curoverse.com>
Mon, 22 Aug 2016 20:39:05 +0000 (16:39 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 22 Aug 2016 20:39:05 +0000 (16:39 -0400)
refs #9773


Trivial merge