Merged from perl.git: "Fix Encode 2.60 with g++"