Merge pull request #1786 from totten/4.4-smarty-ts