Merge commit '63cd4470d62495294aa3cec278d231c18f7ea04c' into HEAD
vi injection on 20140614-002134
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt