Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 17 Jan 2018 15:32:17 +0000 (10:32 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 17 Jan 2018 15:32:17 +0000 (10:32 -0500)

Trivial merge