Merge commit '3a5b3420aecd160a5ad69c9ed658c4902ee0117b' 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