merge from upstream for systems that dont integrate libintl into their C library: