Merge commit '5117953966e40e6ac39d917d31911284ce809b3c' 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