Merge branch '6098-full-text-index' refs #6098
authorTom Clegg <tom@curoverse.com>
Wed, 27 May 2015 13:06:10 +0000 (09:06 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 27 May 2015 13:06:10 +0000 (09:06 -0400)

Trivial merge