Remove "templates".
Merge branch 'develop'