Improved localization in template-handling
Update to latest f3