Fix template list name for renderlayers
Merge branch 'master' into merge_SSS
merge master into merge_SSS