Merge tag 'v1.2.0' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Feb 2019 14:59:10 +0000 (09:59 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Feb 2019 14:59:10 +0000 (09:59 -0500)
Smarty tag updates and other fixes.


Trivial merge