Merge branch 'hotfix/1.0.21' v1.0.21
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 5 Sep 2018 12:06:49 +0000 (08:06 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 5 Sep 2018 12:06:49 +0000 (08:06 -0400)

Trivial merge