Crowdin injection w25 (from 20140617 to 20140619)
Merge branch 'stable/4.0.x' into feature/4.0.x-translation
vi injection on 20140621-002101
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt