fix template include relative paths
Merge branch 'master' into develop