refs #489 These really did not make it into the original commit. I
botched this one hard.
Merge branch 'master' into indexstats