Merge branch 'hotfix-2.1.10'
Version bumped to 2.1.11
Cancelled groups are now shown last.
Merge branch 'hotfix-2.1.11' into develop