template regex mistake
Merge branch 'bugfixes' into develop