Merge commit 'd088eb64c10c9b7ff05a19d25c22906ca73d116a' into HEAD
lt injection on 20140307-002107
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt