Merge branch '2557_chmod_i18n'