Handle missing locale file better
Merge branch 'develop'