closes #6254
authorradhika <radhika@curoverse.com>
Mon, 15 Jun 2015 14:45:21 +0000 (10:45 -0400)
committerradhika <radhika@curoverse.com>
Mon, 15 Jun 2015 14:45:21 +0000 (10:45 -0400)
Merge branch '6254-groups-during-setup'


Trivial merge