Fix #1591 : Fix subdef group/name parameter extraction
Merge pull request #819 from romainneutron/fix-1591

Fix #1591 : Fix subdef group/name parameter extraction