Merge tag 'v1.0.19' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 May 2017 13:04:58 +0000 (09:04 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 May 2017 13:04:58 +0000 (09:04 -0400)
removing forced template functions and using actual template files


Trivial merge