Merge branch '11629-groups-contents-memory'
authorTom Clegg <tom@curoverse.com>
Tue, 9 May 2017 20:33:31 +0000 (16:33 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 9 May 2017 20:33:31 +0000 (16:33 -0400)
closes #11629


Trivial merge