Merge branch '11517-indexes'
authorTom Clegg <tom@curoverse.com>
Wed, 19 Apr 2017 19:04:20 +0000 (15:04 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 19 Apr 2017 19:04:20 +0000 (15:04 -0400)
refs #11517


Trivial merge