Fix Issue #2025 where templates were not being transfered.
Merge pull request #2030 from cordmata/devel

Fix Issue #2025 where templates were not being transfered.