zh-CN injection on 20131124-050833
Merge commit '68686342125b6c29198c14598166e002e333c829' into HEAD