Merge commit '1eebc2b8815823a813c5134613188afd0ee0e2a8' into HEAD
vi injection on 20140405-002105
lt injection on 20140405-002105
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt