Merge tag 'v1.0.5' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 13 Nov 2017 16:54:15 +0000 (11:54 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 13 Nov 2017 16:54:15 +0000 (11:54 -0500)
removing forced template functions from the functions file


Trivial merge