zh-CN injection on 20130930-102831
Merge commit '8f562f6c1979d76ebb11e978dcbd0e5731a7b947' into HEAD