Update for startup code
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/denemo