Merge pull request #798 from bradymiller/smarty-future-proofing_1