vi injection on 20140520-001904
Merge remote-tracking branch 'remotes/origin/feature/3.5.x-PLF-translation' into feature/3.5.x-PLF-translation-jipt