Merge commit '14486a56428462d85ed9f4f41187d6e74d2fd315' into HEAD
it injection on 20140412-002057
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt