Sort languages via their display names
Merge remote-tracking branch 'upstream/master' into fix-7516
Remove unnecessary vars
Merge pull request #7593 from SAPlayer/fix-7516

Sort languages via their display names