fixes #712 - multi-version grouping
Merge remote-tracking branch 'upstream/master'