zh-CN injection on 20130930-102831
Merge commit '23388b9d74ec0d85ed91cec4b15c397ebd40b8ca' into HEAD