Merge pull request #1048 from amvanbaren/cve-cross-spawn-webui

Merge pull request #1048 from amvanbaren/cve-cross-spawn-webui #2133