regrade: support unicode (fix #2446) -- PROD

same as master, #2447