Merge commit '794696ebc789f53039bd12b3c6115ad96cb543de' 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