Merge commit 'b9009a0257f17d537d7d624d44dfb3379dbb0c43' 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