Merge pull request #3700 from gadelat/develop

Fix language overriding for calendar library