bugfix for template
merge master