Merge branch 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles...