Merge commit 'beec4e328033e41a6b2b5c26c791b22dfd809ca2' 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