Added missing namespace in localization
Merge branch 'tmp'