Merge commit '6052e5c5a8f6eb0e89c542d1087ecf001fb8290b' into HEAD
tr injection on 20140527-002111
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt