Locale support using libiconv and libicu, cosmetic improvements
Merge remote-tracking branch 'origin/locale-support' into master5