Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 4 Dec 2017 13:43:51 +0000 (08:43 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 4 Dec 2017 13:43:51 +0000 (08:43 -0500)

Trivial merge