> From: Fabrice Popineau <fabrice.popineau@gmail.com>
> Date: Mon, 12 Jun 2017 06:40:40 +0200
> Cc: Emacs developers <emacs-devel@gnu.org>
>
> Thanks Noam.
> Yes, the case is handled for getenv.
> The problem seems to be with setenv.
> The following is a possible fix.

Do you still see this problem on the current master?  I don't see your
proposed change committed, but I cannot reproduce the problem,
either.  Was this fixed in some other way?