(cherry picked from commit 34ac47fd786e9003dc15359b8ad52c0029bfc365)

Conflicts:

	libpromises/mod_exec.c