Handle properly templateData functions.
Bump version to v2.1.1.
Merge branch 'release/v2.1.1'