Forwarded upstream. I also updated the patch to be a proper patch (not inline) and update all the *.po files, so that translations don't break.
Forwarded upstream. I also updated the patch to be a proper patch (not inline) and update all the *.po files, so that translations don't break.