bug fix
Merge branch 'gitim/fix-localization' into merged_with_master_fixes