Subgrouping works non-recursively (spatialneuron)
Merge remote-tracking branch 'origin/master'