Merge commit 'c69870a7223f5dcfd9b6439ac7f41996965ae680' into HEAD
zh-TW injection on 20140409-002058
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt