Allow @name in template
Merge branch 'upstart-update' into wip