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