Fixes #6520
Merge pull request #6529 from mwerezak/language

Fixes #6520