Merge commit '17d0f77ac91f8833b0ccde25f4c59a29bf8674ea' into HEAD
lt injection on 20140329-002202
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt