fix scoping error in template
Merge branch 'server' into rabe