Merge branch 'wip/lantw/gspawn-declare-environ' into 'master'