Fix #3626: updateLocale merge issue
Fix #3626: updateLocale merge issue

ze-pequeno/moment,PKRoma/moment,OtkurBiz/moment,mj1856/moment,calebcauthon/moment,julionc/moment,OtkurBiz/moment,moment/moment,moment/moment,joelmheim/moment,julionc/moment,joelmheim/moment,PKRoma/moment,calebcauthon/moment,moment/moment,mj1856/moment,Oire/moment,joelmheim/moment,PKRoma/moment,mj1856/moment,Oire/moment,Oire/moment,calebcauthon/moment,ze-pequeno/moment,OtkurBiz/moment,ze-pequeno/moment,julionc/moment