Merge branch '11629-groups-contents-memory'
authorTom Clegg <tom@curoverse.com>
Wed, 10 May 2017 14:23:20 +0000 (10:23 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 10 May 2017 14:23:20 +0000 (10:23 -0400)
refs #11629
refs #11458


Trivial merge