Merge commit 'ccebead50ea8f46a97cb4007ec0c3152e70751a5' into HEAD
zh-TW injection on 20140211-104851
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt