merge Ruby r41786

broken utf-8