fr injection on 20140412-004838
zh-TW injection on 20140412-004838
Merge commit '0abfa97a3bd6f32a8fb68862886e18b167e40fdb' into HEAD