Merge pull request #1296 from TDT-GmbH/sort-language