Merge pull request #1877 from colemanw/smarty