Fix group ordering. Fixes #574
Merge branch '13.09'