Merge remote-tracking branch 'stefanha/trivial-patches' into staging

diff --cc configure
Simple merge

diff --cc cpus.c
Simple merge

diff --cc exec.c
Simple merge