Bug: Don't try to set locale, since we don't use the locale-field anymore.
Merge branch 'hotfix/3.0.1'