Merge commit 'b9f1585ffbbed0a76a550b298cce3e60c2569c79' into HEAD
en injection on 20140612-002153
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt