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