ro injection on 20141205-175111
Merge commit 'cd3ca4a00436c666d824e94eb396fbe06a9180e0' into integration/4.2.x-translation-jipt