ro injection on 20141209-174921
Merge commit 'f3d503fb746ff0842f2e443289b8d169e541d43e' into integration/4.2.x-translation-jipt