Merge commit '15c2b3f8259adebf74f3be01f3a520b1dab2dc23' into HEAD
vi injection on 20140529-002056
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt