Merge commit 'f3cf56e5b1c9b4b153c31bf779ff4ac84498d505' into HEAD
no injection on 20140603-002051
Merge remote-tracking branch 'remotes/origin/feature/4.0.x-translation' into feature/4.0.x-translation-jipt