Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jun 2018 20:40:23 +0000 (16:40 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jun 2018 20:40:23 +0000 (16:40 -0400)

Trivial merge