Merge commit '6e62d0f00f8e91e507208e20cf93d0f3c4505f87' 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