uk injection on 20140416-090901
Merge commit 'b81e5fada8ff93955c6fc620619bb701f9a5289d' into HEAD
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt