Add the workaround when $LANG is not set
Merge branch 'develop'