Bugfix for a template
Merge branch 'master' into ptics_live