Merge branch 'hotfix/1.0.4' master v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Nov 2018 21:38:27 +0000 (16:38 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Nov 2018 21:38:27 +0000 (16:38 -0500)

Trivial merge