Merge commit '21c9b5bdb55a625837173d86ac6d8f0ae9e2e664' into HEAD
fr injection on 20140416-034521
vi injection on 20140416-034521
lt injection on 20140416-034521
sq injection on 20140416-034521
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt