Merge branch 'hotfix/1.0.2' master v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 19:58:58 +0000 (14:58 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 19:58:58 +0000 (14:58 -0500)

Trivial merge