Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 4 Oct 2017 17:29:14 +0000 (13:29 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 4 Oct 2017 17:29:14 +0000 (13:29 -0400)

Trivial merge